Merge branch 'master' into treeview-refactor

Conflicts:
	gtk/gtkmarshalers.list
	tests/Makefile.am

diff --cc docs/reference/gtk/gtk-docs.sgml
Simple merge

diff --cc docs/reference/gtk/gtk3-sections.txt
Simple merge

diff --cc docs/reference/gtk/gtk3.types
Simple merge

diff --cc gtk/Makefile.am
Simple merge

diff --cc gtk/gtk.h
Simple merge

diff --cc gtk/gtk.symbols
Simple merge

diff --cc gtk/gtkcellrenderer.c
Simple merge

diff --cc gtk/gtkmarshalers.list
index 9279037c7cadd5a8be44d74ebda662a4100a79ea,10f0dfd6896c6b214deb8d2b525417bacc8f83f6..fa60a7c91d96c179628a7fc503f36c343c0228e3
--- 1/gtk/gtkmarshalers.list
--- 2/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@@ -69,7 -69,7 +69,8 @@@ VOID:ENUM,FLOAT,BOOLEA
  VOID:ENUM,INT
  VOID:ENUM,INT,BOOLEAN
  VOID:ENUM,BOXED
 +VOID:ENUM,STRING
+ VOID:FLAGS
  VOID:INT
  VOID:INT,BOOLEAN
  VOID:INT,INT

diff --cc tests/Makefile.am
index 283285311b5f9a0c2edb765c88dcaa4ab8981fba,50e3a3167fae14a0eda4484036aca0d0740896af..3bfd2ac39751baceffb8fbd20c5f14adfd607a44
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -98,8 -98,8 +98,9 @@@ noinst_PROGRAMS =  $(TEST_PROGS)      
        testexpander                    \
        testvolumebutton                \
        testscrolledwindow              \
-       testswitch
 +      testcellarea                    \
+       testswitch                      \
+       styleexamples
  
  if USE_X11
  noinst_PROGRAMS += testerrors